am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev

* commit '18b055e106d5452ef390716d3ea8d1641a225361':
  Pass surface insets from window attributes rather than params