Merge "Add null check in UserPreference" into qt-dev