Merge "Make intents immutable" into rvc-dev