Merge "heif: Clamp display height and display width" into main