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

* commit '954f2567f90f1fa8b3d3d7d0c426ebd35494e182':
  Pass surface insets from window attributes rather than params