Merge "Align preference text to actionbar title." into oc-dev