Merge changes from topic "flexi" into main

* changes:
  [flexiglass] Switch scenes when keyguard enabledness changes
  [flexiglass] Home family resolver considers keyguard enabledness