Merge "Revert "Fix scrim turning opaque during occlusion animation."" into tm-qpr-dev