Merge "Fixed the positioning of the media panel after reinflation" into...
Merge "Fixed the positioning of the media panel after reinflation" into rvc-dev am: 604e9592 am: e3dde8ac am: b57c3765 am: 9ba3fda6
Change-Id: If4df560e1730388cf044583846c0c655278624cb