Merge "Clarify notif guts for apps that don't use shortcuts" into rvc-dev