DO NOT MERGE -- Only use saved surface if started by launcher or moved to...
DO NOT MERGE -- Only use saved surface if started by launcher or moved to front am: 813be138 am: 9f92bc26 am: 8673e303
am: 818b7218 -s ours
Change-Id: I6c201932b9c563a0c681b65215957600e2160e5d