[net7.0] Fix a couple life cycle scenarios on shell modals#13986

PureWeen merged 2 commits intonet7.0dotnet/maui:net7.0from

backport/pr-13177-to-net7.0dotnet/maui:backport/pr-13177-to-net7.0Copy head branch name to clipboard