Merge "Add battery percentage switch to display settings"