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

Change-Id: I04b7160390a4c3cdee6f0355e3aeb0fdee0a4719