Merge "Set jdemeulenaere@ and nijamkin@ as OWNERS of PlatformComposeCore" into udc-qpr-dev