Merge "Use inherited visibility to set visibility of managed drawables"