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

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