Merge "Revert "Fix weather clock clipped when swiping in Lockscreen"" into udc-dev