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