Make sure restoration always happen.
Merge pull request #15710 from zuhao/refactor_actionview_digestor_test

Make sure restoration always happen.