am 3264ec7a: Merge "Fit and finish for navbar camera affordance" into klp-dev

* commit '3264ec7ab5efe8592523a68d4b69c5f2f8f514da':
  Fit and finish for navbar camera affordance