Merge "Use phoneAccountHandle based on connection"