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