Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev