Merge "Change ResolveStartupConstStrings default to false"