Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev