Merge "Bugfixes for Dolby Vision support"