Merge "Add child flex node with its margin" into devel/master