[[ Bug 13349 ]] Defer window resize to next screen update during lockscreen
Merge remote-tracking branch 'ian/bugfix-13349' into bugfix-13349
Merge branch 'bugfix-13349' into develop