Merge "Fix position of smartspace in preview not aligned with actual lockscreen" into main