Merge "Add a bailout method for getEditToken"