Merge "Reduce unnecessary context creation for display" into udc-qpr-dev