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

* commit '218dbc0952bdeb37a09278413bbb4a228fc21254':