Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev