Merge "Improvements on CtsPreferenceTestCases:" into qt-dev