Merge "[Unfold animation] Move the dark scrim below" into tm-qpr-dev