Merge "Stop using UserHandle.getUserId() in media sever"