Merge "Use delegation instead of inheritance for WM hierarchy in flicker" into udc-qpr-dev