Merge "Change scrim on lockscreen and transparency of cards a bit." into master-lockscreen-dev