Merge "Set up empty lines for DynamicLayout#updateBlocks() tests"