Merge "Modifies inter/intra coding to allow all tx types"