[ros-diffs] [janderwald] 54757: - rearrange hid stack