Merge remote-tracking branch 'origin/push-notifications' into push-notifications

# Conflicts:
#	app/android/app/src/main/AndroidManifest.xml
#	app/lib/main.dart
#	app/pubspec.lock
#	app/pubspec.yaml
#	serverless_functions/package-lock.json

app/pubspec.yaml

@@ -50,7 +50,6 @@ dependencies:
   geolocator: ^8.2.1
   provider: ^6.0.1
   geoflutterfire: ^3.0.3
-  firebase_messaging: ^11.4.0
 
 dev_dependencies:
   flutter_test: