Merge "Nuke mActivitiesWaitingForVisibleActivity"