Merge "Narrow access to getDataLayerSnapshotForUid()." into rvc-dev