Merge "Fix issues with SHOW_WHEN_LOCKED windows" into nyc-mr1-dev