CB-7976 Android: Use webView's context rather than Activity's context for intent receiver
Merge remote-tracking branch 'upstream/master'