am 7294a594: Merge "Improve scrim handling" into lmp-preview-dev

* commit '7294a594ec993352dc6e743ae313308636afb16d':
  Improve scrim handling