Merge pull request #2642 from sebv/master

Greening CI
stabilized android webview tests
Merge pull request #2643 from Jonahss/master

stabilized android webview tests
various test fixes and improvements
various test fixes and improvements