Merge "Fix NPE from onChildVisibilityChanged."