Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev