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

Change-Id: I94fe7efbe9073a75c8b3fb2b5eb9bd683f1afc8d