Merge "Don't launch activities from statusbar if running" into pi-dev am: 3822490b82
am: 5454567bd0

Change-Id: I9859c2c758271d15e84d6273b2a2f17798a5d646