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