Merge "Refine the performance of updating the insets hint" into udc-qpr-dev