Merge "Adding notion of keyguard widgets" into jb-mr1-dev