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

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