Merge "Lockscreen spacing to UX specs" into sc-dev