Merge "Update uid process state synchronously"