Prioritize the saved data over the current data when restoring widget...

Prioritize the saved data over the current data when restoring widget positions, props SergeyBiryukov, see #19092

git-svn-id: https://core.svn.wordpress.org/trunk@19340 1a063a9b-81f0-0310-95a4-ce76da25c4cd