Merge "Improve scrim handling" into lmp-preview-dev