Merge changes I35683a48,Ia0209281,I9f797676 into main

* changes:
  Add more logging
  Ensure keyguard is hidden on OCCLUDED
  Support keyguard lock timeout and security NONE