Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev am: 3904e1bc34 am: ae53cef574
am: 627c10bb67

Change-Id: I66221adba467621cac23167d8e91c576b5c75554