Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev