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