Merge changes I359aa49c,Ic8ca5afb into nextgenv2

* changes:
  Generalize txfm scale in highbd quantizer
  Parameterize transform scale for quantizer