Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev am: 19628b251d am: 80c031cbd4
am: 233b85b79b

Change-Id: I26f4a6df9a3ae32c26d87d81b54239411572f8a8