Merge "Refactored NMS to handle user switch via the onUserSwitching method" into main