am 4076d4f8: am 12dbee82: Avoid NullPointerException in BrowserFrame

Merge commit '4076d4f887097f3e6d2f1f3863172507629db0b9'

* commit '4076d4f887097f3e6d2f1f3863172507629db0b9':
  Avoid NullPointerException in BrowserFrame