Merge "Commit pending state after mutiple uid updates"