Merge "Do not request relayout when a control background color is changed" into devel...