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