Merge "Handle general display size change for screen decorations" into udc-qpr-dev