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