Merge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev