Merge "Ensure surfaces with insets aren't rendered as opaque" into lmp-dev