Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev