Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved...
Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev am: 19628b25 am: 80c031cb
am: 233b85b7
Change-Id: I26f4a6df9a3ae32c26d87d81b54239411572f8a8