Merge "Enable static overlay for SettingsLib resources"