8d26313d8d
The first needs to happen before dialog layout, the second after DIALOG_SHIM's control state restoration.
The first needs to happen before dialog layout, the second after DIALOG_SHIM's control state restoration.