Merge "Make view intent immutable" into rvc-dev