Merge "Do not hold indicators for apps that become paused" into sc-dev