Merge "Fix some jank in quick settings" into nyc-dev
am: 20a6d36

* commit '20a6d360d3bcdd5aea59849145b3e682026b0f92':
  Fix some jank in quick settings

Change-Id: I6e2cf5adbd32a2d4c35e7dc04996d9cdc993fd29