Merge "Update GlobalCellId during Un-parceling" into rvc-dev