Merge "Add null check for RemoteToken#getContainer()"