Fix issue #336#339

ly85206559 wants to merge 2 commits intogoogle:maingoogle/flexbox-layout:mainfrom

ly85206559:masterly85206559/flexbox-layout:masterCopy head branch name to clipboard