Merge changes I2153c57e,I0e291edd into nextgenv2

* changes:
  Palette: Generate encodings automatically from tree.
  Palette + Ext-Intra: shadowed declaration fix.