Merge changes Ic4011b8e,I641bb381 into main

* changes:
  [AppOps] Remove unwanted UidState objects more quickly
  [AppOps] Make some corrections towards UidState initialization