(cherry picked from commit da29459c) # Conflicts: # lib/core/platform/pigeon_api_facade.dart # pubspec.lock