Merge "Prevent 3 button layout from dragging buttons"