am 7ec1b902: am f08ff22b: am adf571c7: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop

* commit '7ec1b902bf3bdd6dfae08519db49301f4efc0861':