am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev

* commit 'af638c4f9daa74b4c8e0905f07e11290f6845abe':
  Add camera affordance to navigation bar on phones