Merge "[flexiglass] Lockscreen -> split shade transition touchups" into main