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

* commit '3fff156e13341b0bf818f83d2bb0e9404285dd0c':
  Pass surface insets from window attributes rather than params