Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev