Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev