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

Change-Id: Ided3d95e865a1c1bcb6726bfaba0fad25f6ff27b