Merge "Assigns Ids to the internal rotation resolver callback." into sc-dev