Replaced flex-flow shorthand with flex-direction rule to avoid conflicts
when Orientation is set on a Flex widget.
Merge remote-tracking branch 'origin/master'