Merge "Implement smoother swipe animation for Phone UI"