Merge "Process insets correctly" into qt-dev am: 2534d6ecee
am: 70388a0874

Change-Id: I93e1cd9b91e255da1b481f1e27ad3c4cca95ce67