Merge "Remove recycling HeadsUpManagerPhone objects" into main