Merge "Remove unwanted padding from delete button" into lmp-mr1-dev