Merge "Large screens: fully fade in behind scrim before anything else on shade" into tm-qpr-dev