am 790489fa: Merge "Implement settings affordance in header."

* commit '790489faa36ed4c5941803e5c38c7d439b5f213c':
  Implement settings affordance in header.