am 7f0d1e19: Merge "Fix NPE in onVisibilityChanged" into lmp-preview-dev

* commit '7f0d1e193bbf2dc189c2de6e3329aac0afda1d76':
  Fix NPE in onVisibilityChanged