Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev