Merge "Remove activity from stopping list when removed from display"