Merge "Fit and finish for navbar camera affordance" into klp-dev