Merge "[sf-newfe] Set correct composition type for refresh rate layer" into main