Merge "Fix clock position is too high in lockscreen preview in tablet portrait mode" into main