Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev