Merge "Add ability to adjust height of VideoPreference" into qt-dev