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

* commit 'b97a71e8bd9877f4d4e47ec41408079552ab165b':
  Getting rid of keyguard widget flag that isn't used