Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8
am: 9d80859f78
am: 3524aedca3
Change-Id: I2773767679bbcbc47edef0172f4f742100acd506
This commit is contained in: