Merge changes I67a7dfcb,I31953bed into main

* changes:
  Fix WindowManagerLockscreenVisibility
  Flag off all edges leading KTF out of the Lockscreen scene