Persist dialog state across configuration change

Fixes: 132208703

Test: Follow steps in comment#1

Change-Id: I82b77ec1536ce2811fa94f07296d25120e17f241
4 files changed