Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I89057ed1f557bece42985fc0a42059241562ec4c
Merge topic '14007-add_space_navigator_grab_world_style' into next

46475d9 Added interactor style for the 3DConnexion SpaceNavigator