Merge "Rename mUserHandle to mUserId for better understanding"