am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev

* commit 'c1c53e56fb5222bfdd17f0a9f735efe5c1b8cb70':
  Fix dream/keyguard infinite layout loop.