Merge "Add ripple to navigation bar button"