Turn \Flow\View into a ContextSource

Also did some code cleanup

Change-Id: I1272a7b3bf2b017eb6aa05312dad6c0e92081f99
Merge "Turn \Flow\View into a ContextSource"