cherry pick mapview changes from webview branch