Merge "Improvements on CtsPreferenceTestCases:" into qt-dev
am: ef287f620a

Change-Id: I9f2b508fd2582ceef1371ef3e5cb019f034d27ef