Merge "Fix WebChromeClientTest#testOnProgressChanged DO NOT MERGE" into jb-mr2-dev