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

Change-Id: I09884f02aa32248395f5d7fdb79af29bd1aebfcf