Merge change 325

* changes:
  Check for null before animating the tab/webview.