Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev