Proper support for frame images (do not display magnify icon).

Change-Id: I94792760e6b1ff69ab13501939bf8d10e0558e5b
Merge "Proper support for frame images (do not display magnify icon)."