Merge "Add fallback for preferences theme" into qt-dev