Merge "Update lockscreen shortcuts color tokens" into udc-qpr-dev