Merge "Reduce the JB delay and fix the JB size calculation logic" into udc-qpr-dev