am bfbd58de: Merge "Fix bug 7338736. Only starting FUL if the screen is on" into jb-mr1-dev

* commit 'bfbd58de8d0d5487f2d8a67e99a9854019c22039':
  Fix bug 7338736. Only starting FUL if the screen is on