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