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

Change-Id: Iac98c996ba13b59319a12b089be234366a8e7213