Merge "Revert "Enable static overlay for SettingsLib resources""