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

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