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