Merge "Fix scrim tint when swiping up"