Merge "Fix ActivityView input forwarding."