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

Change-Id: I594079cd01aedb6f14cb534d43b8c0820a63c442