Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev