Merge "Fix NPE in onVisibilityChanged" into lmp-preview-dev