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 '905157ef4d56266d52496cec237e348624901de4':
  Change the way view ids are assigned (issue 11627801)