Merge "Misc. high-bit-depth fixes"