Merge "ItemTouchHelper swipe improvements" into mnc-ub-dev