Flow refactor in order to have better performance and minor bug fixes…

[Jaics262]

… (#1794)

Q	A
Bug fix?	no - yes?
New feature?	no - yes?
New sample?	no - yes?
Related issues?	fixes #X, partially #Y, mentioned in #Z

What's in this Pull Request?

Please describe the changes in this PR. Sample description or details around bugs which are being fixed.

Guidance

You can delete this section when you are submitting the pull request.

• Please update this PR information accordingly. We'll use this as part of our release notes in monthly communications.
• Please target your PR to Dev branch.

[msftclas]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

:x: Jaics262 sign now
_{You have signed the CLA already but the status is still pending? Let us recheck it.}