Merge "SF: improve RenderThread jank classificaion" into udc-qpr-dev