Merge "Fix crash on rotation while ICE dialog is open"