am 5782c16d: am c36303a6: Merge "Applying ChannelScrolling to remove calculateDragAngle"

* commit '5782c16d34d839282978f94b1421e91da1e70cde':
  Applying ChannelScrolling to remove calculateDragAngle