am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev

* commit '5a0f5ba269c12889246acbbe546ef75285231430':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)