Merge changes from topic "revert-25954841-FGHJCZIYMT" into main

* changes:
  Revert^2 "[AppOps] Remove unwanted UidState objects more quickly"
  Revert^2 "[AppOps] Make some corrections towards UidState initiali..."