Fix fullscreen bug where image was replaced with self

Change-Id: I81dcadae96a778559564a786a5753323fb802b7c
Merge "Fix fullscreen bug where image was replaced with self"