Merge "Improve Phone UI's horizontal swipe behavior"