Merge "Use AddChildWithMargin when add child to FlexLayout" into devel/master