Merge "Use drop shadow for screenshots instead of scrim" into tm-dev