Merge "Fixed the display of the brightness controls in the system panel" into honeycomb