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