Merge "Make spreadAnyEditBlock() calls respect read-only mode"