Merge changes from topics "scene_container_tapl1", "scene_container_tapl2" into main

* changes:
  Fix LockScreenWithValidPassword with scenes enabled
  Add partial TAPL support for Scene Container