Merge "Remove drop target button drawable padding if text isn't hidden" into sc-v2-dev