Merge "Fix ItemTouchHelper log messages when dragging or swiping is disabled" am: 721de09a57 am: d9ac4809c7
am: ce4c1258f3

Change-Id: I41bfde18b357e2599d9fb81d2532871219acb5fc