Merge "Set the "Allow diagonal scrolling" switch minimum height to 48dp" into main