Merge "Do not always report configuration change to activity" into rvc-dev