Merge "Only call Drawable.setVisible(false) for visible outgoing drawables" into nyc-dev