Merge "Never consider windows visible if appToken is hidden" into oc-dr1-dev am: 8e9984ee83 am: 15500f3d7b
am: 35855c8cf2

Change-Id: I73493c514d21992658d97048d41e02130a07fc1f