Merge "Ensure size-compat check is correct in LaunchParamsModifier"