Merge "Check Settings.Global before sysprop in FeatureFlagUtils."