Merge "Fix rebuildWebTextView issues"