Merge "Fix ConcurrentModification in onUidStateChanged" into rvc-qpr-dev