Merge "Instances of SystemUI must now define their own ComponentBinder"