Fix vlayout flex calculation
Merge remote-tracking branch 'VincentJian/flex'