Merge "Support local overrides for sysprops" into main