Merge "Enable insets cache for display switch" into udc-qpr-dev