Merge branch 'bugfix/8158-stacked-rootfs-vs-chroot-browsers' into bugfix/7951-refactor-chroot-browsers