Merge "Roll back qs_theme parent" into qt-dev