Merge "RRO: Synchronize access to overlays.list"