am 9b5d028c: Merge "Interim quick settings update."

* commit '9b5d028c695d2d6f1612648b2ac27a7b7577c436':
  Interim quick settings update.