Merge "Remove branch in inner loop of foreach_transformed_block_in_plane()"