Merge "UltraHDR: update Version handling. am: 05ceebfbae am: 2b6e2abb39"