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