am 82e3ea95: am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher" * commit '82e3ea95':