Merge "Update drop target button alignment across devices" into tm-dev