Merge "Replacing (raster_block >> tx_size) with (block >> (tx_size << 1))."