Merge "Fix screenshot buffer leaks" into udc-qpr-dev