Merge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop