Merge "Move DensityUtils into SettingsLib" into nyc-dev