Merge "Remove drop target button drawable padding if text is hidden" into sc-qpr1-dev