Merge "Remove getUserId mock method from Mock Context." into main