Merge "filter_block_plane: remove MACROBLOCKD param"