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

* commit 'fa7a581a77ab2aba6b8dfc06b91557a3271fa3bf':
  De-jank quick contact animation