Merge "Prevent dialog launch from crashing in rare cases" into main