Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev