Merge "Improve feedback during spring loaded mode" into honeycomb