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

Change-Id: I0479dc1a30266dd01ac0a32dbe1e9a705217c87d