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

Change-Id: Ie607e0cabdecd5b3b44220e2074b4007a22c19c8