Merge "Add boot user override id to its own label" into qt-dev