Merge "Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D"