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