am 2d3519b9: Merge "De-jank quick contact animation" into jb-dev

* commit '2d3519b9d7a720705fce0fb18cdbed4fd6a2962c':
  De-jank quick contact animation