Merge "Added new testNotifyCellLocationForSubscriberByUserSwitched" into sc-dev