Merge "Avoid reporting unhandled config changes to activity" into rvc-dev am: 5ff2b3ce am: 8b6ddea2 Change-Id: I31315640667ce1ab47a20dd6dd984b75e0a4b9f3