Merge "Update spacing/layout of LS clock"