This matches the behavior from before the shell refactoring. Fixes https://github.com/flutter/flutter/issues/16754