Merge "Make FlexContainer as public API" into devel/master