Merge "Back Arrow tweak slow swipe and fling animation" into udc-dev