Merge "Use correct gravity for 3-button gesture insets" into udc-dev