Merge "Use Flags and SystemProperties on debug builds." into main