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

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