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

* commit 'adf571c7725f0281a3e37a4b6254818da956ca53':