Merge "Ensure forwarding listener target is long-clickable" into nyc-mr1-dev