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

Change-Id: I718f012a17a42a7d88a65048baa8d0ec747cc9c4