Merge "Make DND intent immutable" into rvc-dev