Merge "Implement new Layout manager APIs"