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