Merge "Fixed Settings Crash" into qt-r1-dev