Merge "DO NOT MERGE: Fix various settings chassification bugs" into qt-dev