Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev