Merge "Add dark scrim from a background thread during unfold" into tm-qpr-dev