Added several fixes to our editor restoration methods.
Reordered the code a bit for readability.
Merge pull request #2789 from wordpress-mobile/issue/editor-355-vc-restoration

Editor restoration fixes.