Merge "Add SimpleOnItemTouchListener and make OnItemTouchListener interface again" into lmp-mr1-ub-dev