Don't lose values for cmrf_display fields when coming back from preview

Closes #3447564

This also drops the setting of $element['#value'] like !21 (closed) so this fixes #3447541, too.