Merge "Also update manage profile state after a transition finishes" into main