Merge "Remove "SelectedStateImage","UnselectedStateImage" and "DisabledStateImage...