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

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