Merge "ToggleButton could keep a reference to a previous drawable"