Merge "Fix snooze guts disappearing in split shade" into sc-v2-dev