Merge "Remove duplicates between battery and display settings" into oc-dev