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

* commit 'f08ff22bc3ea2c12015040071dbc68abda13f4bb':