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

Change-Id: Ia0d73a4370f9a42644d7ad2f63443c2221391b3d