Merge "Clear display white balance transform when disabled"