Merge "Consolidate waiting list of visible and launched activity"