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

* commit 'f38a2eb1648dffc44ada50d4344f37679ae55b34':
  Don't let old Launcher activity interfere with new one