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