Merge "Ensure Autofill save dialog buttons are always visible when text is long + display/font size is large" into main