Merge "Disable HBMController HDR boost if HDRModifier is enabled" into main