Merge "Getting rid of keyguard widget flag that isn't used" into jb-mr1-dev