Merge "Fixes two layout issues with lockscreen compose" into main