Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-dev