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