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