Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev