Fix image preview for tablets

Bug: 57435
Bug: 58218
Change-Id: Ibb18e0ab87f0c64c3edc7ffff84a9b618e0cd263
Merge "Fix image preview for tablets"