Merge "Improve handling of AlertDialog padding between title and content" into nyc-dev