Merge "Add right padding to two target preference text area" into oc-dr1-dev