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