Merge "Replace mockito with a mock class in DynamicLayoutTest"