Merge "Move adding views logic to privateProfileManager" into main