Merge "Remove duplicates between battery and display settings"