Merge "Query the uid process state in opChanged instead of relying on callbacks." into main