[Depends on #1130] Dynamic dialog field data migration

This should be merged in after #1130 

/cc @gmcculloug 
`== true` is redundant and shouldn't be needed.  Same comments for below.