Merge "Add com.android.settings to white list"