Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev am: 3904e1bc am: ae53cef5 am: 627c10bb Change-Id: I66221adba467621cac23167d8e91c576b5c75554