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