Merge "Initialize UidStates in system ready"