Merge "Fix clock translation on lockscreen" into udc-dev