Revert layout changes in Media viewer

Includes:
Ic1c9d82ea8b4498004ab3530fd903f632c3d4a1b 

Change-Id: I44cc33349167367b5f7d01780f44d5bb64d0f269