Merge "Don't defer client hidden if activity is already paused"