Merge "Controls are LayoutGroups instead of LayoutItems" into devel/master