Merge "Change background color of fold/unfold" into tm-qpr-dev