Merge "Fix contants; RT-enable WebView pt2"