Merge "SceneContainer now depends on ComposeLockscreen" into main