Merge "Apply the correct theme to DockPreference"