Only set client hidden if both hidden and hiddenRequested am: 752cd826b9
am: 953564921b

Change-Id: I741e7c4d640069796cdc75221de10924a75295dc