Merge "Separate updating views from deriving state" into rvc-dev