am 76980e33: Merge "Fix binding problem with no screens (issue 11768766)" into jb-ub-now-jolly-elf

* commit '76980e33978b3d1aa1fd870e98995c713ba2e1d0':
  Fix binding problem with no screens (issue 11768766)