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

Change-Id: Ifa3f3c3a0247a373b0f36bbb9c49d64ab87d23a5