Merge "Add package information to user aspect ratio intent" into udc-qpr-dev