Merge "Remove possible memory leak on compat ui layer" into udc-qpr-dev