Merge "Added a unit test for DynamicLayout#updateBlocks"