Merge "Handle null phone instances" into main