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

Change-Id: I3de16803747f58fba71d6e33ea934eb309d2310b