Merge "Don't defer client hidden if activity is already paused" into oc-mr1-dev am: b3a8950183
am: 36276fd6ee  -s ours

Change-Id: I8a04854f153979490d3db693687a2736b6cf8bc7