am e9b198fd: Merge "Change the way view ids are assigned (issue 11627801)" into jb-ub-now-jolly-elf

* commit 'e9b198fd7414771db3df259ce696f0070ea9a153':
  Change the way view ids are assigned (issue 11627801)