Merge "Only use saved surface if started by launcher or moved to front"