Merge "Introduce monitoring behavior changes for USI devices (2/n)"