Merge \"Ensure forwarding listener target is long-clickable\" into nyc-mr1-dev
am: 48c5f38b34

Change-Id: I40fd45addb421ea8e817f5e48e18f1d4286c9917