Merge "Prevent recomputeDisableFlags from clobbering the system disable flags" into sc-v2-dev