Merge "Add depth to tx_size mapper to bit-stream coding" into nextgenv2