Merge "Remove unnecessary drawable code in CompoundButton"