Merge "Update setting icon paddings to align with actionbar title" into oc-dev