Merge "Avoid reporting unhandled config changes to activity" into rvc-dev