Merge "New flag for lockscreen jank fix" into udc-dev