Merge "Add touch feedback to trash and expand/collapse arrow" into lmp-dev