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
am: 9a7dccf5 -s ours
Change-Id: If1ed9f64b6cae04c47f4e5bfd001b78af6ae5553