Merge "Properly reset the block coding skip flag array in non-RD mode"