Merge "Remove the padding for VideoPreference" into pi-dev