Merge "Pass webview instance when getting base layer / color, and prevent null value" into jb-dev