Merge "Use final strings for edit mode and adjust the reset dialog UI" into main