Merge "Don't launch activities from statusbar if running" into pi-dev