Make dialogs work again (might need cleanup once/if we get framework support)

Change-Id: I1e46376a69cadc3c3c638130b901e84999407a3f
1 file changed