Merge "Construct the UidState in case of not found during unparceling" into tm-dev