Merge "encoder: Fix entropy sync mode for height <= 64"