Merge "Darker scrim under unlocked shade" into pi-dev