Merge "Make control panel black" into rvc-dev am: 49a07e5bff am: bd90ff21fc am: a7221e33c3 am: 2db3f152aa

Change-Id: I5649d464bffda964b1c9b45abc79e531a93e215c