Merge "Merge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev am: 697a3334 am: de914de" into nyc-mr1-dev-plus-aosp