Merge "Add tests for layout overlaying"