Merge "Add test for MediaControlPanel" into rvc-dev am: 0606dd5670

Change-Id: I2e6f11446fd87eaf52bc79ef8f3e23f886323b09