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

Change-Id: Id647b704035509a3b2bd0611a0efe78da3ede668