Merge "Fix a bug in appwidget migration to multiuser directory." into jb-dev