Merge "Flexbox UI control implementation" into devel/master