Merge "Fix issues with SHOW_WHEN_LOCKED windows" into nyc-mr1-dev
am: 163f8eac70

Change-Id: I6359806758b704aaa28e8e3393cd02316bb8e079