Merge "Update theme after registering config listener" into qt-dev