Merge "Merge "Update nav bar buttons to spec." into tm-qpr-dev am: be17da6e am: 4de6ccc5" into udc-dev