Merge "Never consider windows visible if appToken is hidden" into oc-dr1-dev