Merge "Fix windows not showing when SHOW_WHEN_LOCKED changes" into lmp-dev