Merge "Revert "Change notifications service to listen to generic pofile availability intents"" into main