Merge "Remove BLOCK_FLAG_SLIPPERY constant"