This changes content insets handling (cherry picked from commit 3fa68ed2171ae930f8d5070123483e2e6c4cfb4c)