Merge "Fix notification shelf icon showing on top of snooze leave behind"