Merge "Make implicit intent immutable." into rvc-dev