Merge changes Ice414d9d,I08c347c0,I35083685 into main

* changes:
  Parameterize Lockscreen tests for scene container flag
  Remove unnecessary nullability
  Parameterize NotificationListViewModelTest for scene container flag