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

* commit 'c5b499a2d05ac6e94e6ee8b4e2a380c9e59f856f':