IMO first we will need to fix #9106 and #9107. If we introduce this change and don't fix the two bugs mentioned users won't be able to navigate in these two dialogs after tabbing to Cancel button and back or opening these dialogs for the second time.