Merge "On occlusion: use AUTH_SCRIMMED scrim state" into tm-qpr-dev