am 4faad8d6: am 5cc7c35d: Merge "Improve feedback during spring loaded mode" into honeycomb

* commit '4faad8d612623bc27d3e7ee3ef244828507e25fb':
  Improve feedback during spring loaded mode